diff --git a/tests/codeigniter/core/Benchmark_test.php b/tests/codeigniter/core/Benchmark_test.php
index 7fd0727..63b0e3d 100644
--- a/tests/codeigniter/core/Benchmark_test.php
+++ b/tests/codeigniter/core/Benchmark_test.php
@@ -4,7 +4,7 @@
 
 	public function set_up()
 	{
-		$this->benchmark = new Mock_Core_Benchmark();
+		$this->benchmark = new CI_Benchmark();
 	}
 
 	// --------------------------------------------------------------------
diff --git a/tests/codeigniter/libraries/Parser_test.php b/tests/codeigniter/libraries/Parser_test.php
index 3755cf1..2a23487 100644
--- a/tests/codeigniter/libraries/Parser_test.php
+++ b/tests/codeigniter/libraries/Parser_test.php
@@ -4,7 +4,7 @@
 
 	public function set_up()
 	{
-		$this->parser = new Mock_Libraries_Parser();
+		$this->parser = new CI_Parser();
 		$this->ci_instance_var('parser', $this->parser);
 	}
 
diff --git a/tests/codeigniter/libraries/Typography_test.php b/tests/codeigniter/libraries/Typography_test.php
index 5dba062..e6ee7b0 100644
--- a/tests/codeigniter/libraries/Typography_test.php
+++ b/tests/codeigniter/libraries/Typography_test.php
@@ -4,7 +4,7 @@
 
 	public function set_up()
 	{
-		$this->type = new Mock_Libraries_Typography();
+		$this->type = new CI_Typography();
 		$this->ci_instance('type', $this->type);
 	}
 
diff --git a/tests/codeigniter/libraries/Upload_test.php b/tests/codeigniter/libraries/Upload_test.php
index 4d9e4a4..a953d83 100644
--- a/tests/codeigniter/libraries/Upload_test.php
+++ b/tests/codeigniter/libraries/Upload_test.php
@@ -5,7 +5,7 @@
 	function set_up()
 	{
 		$ci = $this->ci_instance();
-		$ci->upload = new Mock_Libraries_Upload();
+		$ci->upload = new CI_Upload();
 		$ci->security = new Mock_Core_Security();
 		$ci->lang = $this->getMock('CI_Lang', array('load', 'line'));
 		$ci->lang->expects($this->any())->method('line')->will($this->returnValue(FALSE));
diff --git a/tests/codeigniter/libraries/Useragent_test.php b/tests/codeigniter/libraries/Useragent_test.php
index aed38b8..c02f2bd 100644
--- a/tests/codeigniter/libraries/Useragent_test.php
+++ b/tests/codeigniter/libraries/Useragent_test.php
@@ -11,7 +11,7 @@
 		$_SERVER['HTTP_USER_AGENT'] = $this->_user_agent;
 
 		$this->ci_vfs_clone('application/config/user_agents.php');
-		$this->agent = new Mock_Libraries_UserAgent();
+		$this->agent = new CI_User_agent();
 		$this->ci_instance_var('agent', $this->agent);
 	}